some changes and new println