some xscala stuff added