Fixed syntax and added more variables