Reverted some stupid shit - added some nice shit