Added the last modifications to the commit >.<