This is a updated version of my v1 and this is v2