Fixed timeshifting, added keywords