Cleaned up method on 110401