#943 - More Selfishly Oriented

#943 - More Selfishly Oriented