Solved the issues mentioned by Dennis