updated now removing the optional elements