changed to proper variable format