Commented out possible improvements