More stuff & defines