Currently Using Improved Version