Added builder
some stuff