Updates to add overlay functionality