Eliminated global context
version updated