Added non-functional properties
No merge tool on android, letsee what happens
test
lololo