Feature/convert to the gizra way