Updated to new way