Copied changes from next.davidlartey.com repo