tryn again

merging changes and deleting branch