fixed overly complicated shit