Change the any handling alot