4th commit - improvements