More debugging/changed code