Updated code and application