edited app to suite for server usage