Added ability to nest 'then'