Major update to create a real gem !!!!!!!!!