Adding more overlay functionality