changes made according the PULL REQUEST demands