Improved version - ready for usage