agreed this needs more attention