Updated to work with my new concept