organized better - fixed an issue in linux