More work on code