Modifications made to handle stuff