General debugging
Updated dev version