Updated organized code