Modified buildcommand