This can be combined with the existing method, no?