merged lukas' changes from FTP