Need to fix stuffz