make it buildable

cleaner way