fixing what I dont like about this plugin!