New version, that suits both on VPS and on local machine