Fixed: some changes to improve