updated to not throw errors