Either make this a private method or  a decorator