added changes from 7th of May