Threads added and calendar fixed