Big changes for easy used