Changed deadlines to include top and bot