New version with controlls