Source code improved