Updated version and added return value