Some implemented changes to be compatible (maybe...)