Added the changes mentioned by Dennis and Tackat