added topic, made more changes