Updated code and content