#75 working so removing useless stuff