reverted unecessary changes; I misunderstood some functionality