Final crucial changes made | limited testing