removed useless functions, changed slots