Moved to API + log added back