1st iteration fixes