Added method for David to call
Cleaned up method