Added new features for blah