Attendance details separated

Please merge