Final w/o mako implimentation