Dealt with nick tracking and issues 42,44. May be buggy.