More debugging added