fixed everything alix broke