Update it to easier way