added some code 'n' stuff