Removed temp functions