modernize this shiat!
fixes