bug fixes
updated code for 4-24