updated to work in ff and removed useless things