Changed direct + bug fixing