Switched to using martini