working changes from last commit
integrated ticker