FULLY WORKING now making it better