small changes
finished v1