Commented out leap stuff