Removed dependency on C5