added some awesome stuff here