- Merged Alex's changes