more code update from the master 🙂