Updated version for new development