Changed development to fix some bugs