Added some last modifications