added actual line composition, need to check on how values stored in db