Added some temp solutions