finishing some methods
finish v1