Commented out unnecessary parts