Changed appearance and added general