Updated code and text