More work done, got help from TA