some changes with look and code