update after mergin most reent changes from small studio