merged gui changes back in