temp fix and shit