Added new contests, optimized code