final draft w minor bug