bullshit now
merge of test.jaa