Made final changes to working version