update
added concerns and fix types