Comments by Turbo87 implemented