updated for fixes