more modification work done. needs updating stopping working for some reason.