Adopting new awesome version, minor changes