some changes :3