Updated code and design