codes amended as requested