Made some changes - still not really working...