Converted project to 'when' friendly