added ifndef's