Improved to easier usage