Added new list for finishing requests and some cleanup