changes to build easier