worked on end product
main merge removed