Applied second code revisions