Removed problematic code because of nil class isses