updated new way of doing things