#31 several changes