Improved my method