UPDATE AND FIXED BUGS