updated to have some good stuff