Updated version for development