BigChick: Update 17-Feb

Performance improvement Minor fixes