removed variables and added in manually