Commented out the use of custom cell class and using default for now