Reverted to working example code