Modifications made for compatability with devices