Forgot to remove debug echo's