Added 2 build functions