Improved functionality :D