Updates and Fixed bug