updated code for refactored system