added a lot of stuff…. again