changed tot he new way