Build safe (20/40)

Build safe