moved extra stuff out