Removed custom renderer for now