FINAL WORKING MAKEFLOW