Added manual added stuff