Readded small changes