Updated version for submission