added some extra stuff i threw together