removed optionals