Working on optomizing it