fix bug and work on builder