Shorten down implementation to workable state