After basic validations and bug fixes